Merge changes Icafa2067,Ie8c0bc40 into studio-1.3-dev automerge: 0fda689 * commit '0fda689047beb07349aa5a5c356fd109843a3bec': Code cleanup, removed warnings and removed potential NPEs. Minor cleanup of test code.